Merge branch '312/upstream' into 312/master
authorStephane Glondu <steph@glondu.net>
Sun, 18 Apr 2010 12:17:14 +0000 (14:17 +0200)
committerStephane Glondu <steph@glondu.net>
Sun, 18 Apr 2010 12:17:14 +0000 (14:17 +0200)
commit4cf93c3c21b31fd6fe9b2ecf25f67398de776bfa
tree660099a1aaf3ff2b554dc6e1cb9e254cbcec50fe
parent13a73e44b439673efa40eb3aa3de8db29bd8cd4f
parente18748f4de1573b97bf9491fbeed0f990fc291db
Merge branch '312/upstream' into 312/master